a28984748c7220291a2f4b3724f6aa3c0e8e2f9c,opennms-webapp/src/main/java/org/opennms/web/svclayer/inventory/InventoryService.java,InventoryService,getRancidNode,#number#boolean#,105

Before Change


            List<RancidNodeWrapper> ranlist = new ArrayList<RancidNodeWrapper>();
            
            // Group list 
           RWSResourceList groups = RWSClientApi.getRWSResourceGroupsList(m_cp);
            
            List<String> grouplist = groups.getResource();
            Iterator<String> iter1 = grouplist.iterator();
            
          
            String groupname;
            boolean first = true;
            while (iter1.hasNext()){
                groupname = iter1.next();
                log().debug("getRancidNode " + rancidName + " group " + groupname);        
                
                try {
                    if (first){
                        RancidNode rn = RWSClientApi.getRWSRancidNodeTLO(m_cp, groupname, rancidName);
                        nodeModel.put("devicename", rn.getDeviceName());
                        nodeModel.put("status", rn.getState());
                        nodeModel.put("devicetype", rn.getDeviceType());
                        nodeModel.put("comment", rn.getComment());
                        nodeModel.put("groupname", groupname);
                        first = false;
                    } 
                    RancidNode rn = RWSClientApi.getRWSRancidNodeInventory(m_cp ,groupname, rancidName);
                    String vs = rn.getHeadRevision();
                    InventoryNode in = (InventoryNode)rn.getNodeVersions().get(vs);
    
                    RancidNodeWrapper rnw = new RancidNodeWrapper(rn.getDeviceName(), groupname, rn.getDeviceType(), rn.getComment(), rn.getHeadRevision(),
                      rn.getTotalRevisions(), in.getCreationDate(), rn.getRootConfigurationUrl());
    
                    ranlist.add(rnw); 
                    
                }
                catch (RancidApiException e){
                    log().debug("No inventory information associated to " + rancidName);
                }
            }
            

After Change


        
        // Group list 
        RWSResourceList groups;
        try {
            groups = RWSClientApi.getRWSResourceGroupsList(m_cp);
        } catch (RancidApiException e1) {
            log().error(e1.getLocalizedMessage());
            return nodeModel;
        }
            
        List<String> grouplist = groups.getResource();
        Iterator<String> iter1 = grouplist.iterator();
        
      
        String groupname;
        boolean first = true;
        while (iter1.hasNext()){
            groupname = iter1.next();
            log().debug("getRancidNode " + rancidName + " group " + groupname);        
            
            try {
                if (first){
                    RancidNode rn = RWSClientApi.getRWSRancidNodeTLO(m_cp, groupname, rancidName);
                    nodeModel.put("devicename", rn.getDeviceName());
                    nodeModel.put("status", rn.getState());
                    nodeModel.put("devicetype", rn.getDeviceType());
                    nodeModel.put("comment", rn.getComment());
                    nodeModel.put("groupname", groupname);
                    first = false;
                } 
                RancidNode rn = RWSClientApi.getRWSRancidNodeInventory(m_cp ,groupname, rancidName);
                String vs = rn.getHeadRevision();
                InventoryNode in = (InventoryNode)rn.getNodeVersions().get(vs);

                RancidNodeWrapper rnw = new RancidNodeWrapper(rn.getDeviceName(), groupname, rn.getDeviceType(), rn.getComment(), rn.getHeadRevision(),
                  rn.getTotalRevisions(), in.getCreationDate(), rn.getRootConfigurationUrl());

                ranlist.add(rnw); 
                
            }
            catch (RancidApiException e){
                log().debug("No device found in router.db for:" + rancidName + "on Group: " + groupname);
            }
        }